From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 9 Jan 2011 03:29:49 +0000 (-0500)
Subject: Minor fix to GTK tool-bar button refresh code.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~2878^2~26
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=21a76236f6530c2c01385956f0984f34e017f5c5;p=emacs.git

Minor fix to GTK tool-bar button refresh code.

* gtkutil.c (update_frame_tool_bar): Don't advance tool-bar index
when removing extra buttons.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 34154e3bf28..b94fc68fe3f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-09  Chong Yidong  <cyd@stupidchicken.com>
+
+	* gtkutil.c (update_frame_tool_bar): Don't advance tool-bar index
+	when removing extra buttons.
+
 2011-01-08  Chong Yidong  <cyd@stupidchicken.com>
 
 	* fns.c (Fyes_or_no_p): Doc fix.
diff --git a/src/gtkutil.c b/src/gtkutil.c
index fb003749493..905bbb1561d 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -4439,7 +4439,7 @@ update_frame_tool_bar (FRAME_PTR f)
   /* Remove buttons not longer needed.  */
   do
     {
-      ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), j++);
+      ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), j);
       if (ti)
 	gtk_container_remove (GTK_CONTAINER (wtoolbar), GTK_WIDGET (ti));
     } while (ti != NULL);